assertion here that we were at the end iterator was not correct; change

2001-11-29  Havoc Pennington  <hp@redhat.com>

	* gtk/gtktextiter.c (_gtk_text_iter_forward_indexable_segment):
	assertion here that we were at the end iterator was not correct;
	change code to move us to the end iterator. bug #65731

diff --git a/ChangeLog b/ChangeLog
index 2aa81d2cce791832db3de66f1a62ec3ddc74c62e..a13891feb95d1cd1b784c729b132f8a78ec12a90 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-11-29  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktextiter.c (_gtk_text_iter_forward_indexable_segment):
+       assertion here that we were at the end iterator was not correct;
+       change code to move us to the end iterator. bug #65731
+
 Wed Nov 28 20:05:44 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkaccellabel.c (gtk_accel_label_refetch): Remove 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 2aa81d2cce791832db3de66f1a62ec3ddc74c62e..a13891feb95d1cd1b784c729b132f8a78ec12a90 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+2001-11-29  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktextiter.c (_gtk_text_iter_forward_indexable_segment):
+       assertion here that we were at the end iterator was not correct;
+       change code to move us to the end iterator. bug #65731
+
 Wed Nov 28 20:05:44 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkaccellabel.c (gtk_accel_label_refetch): Remove 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2aa81d2cce791832db3de66f1a62ec3ddc74c62e..a13891feb95d1cd1b784c729b132f8a78ec12a90 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2001-11-29  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktextiter.c (_gtk_text_iter_forward_indexable_segment):
+       assertion here that we were at the end iterator was not correct;
+       change code to move us to the end iterator. bug #65731
+
 Wed Nov 28 20:05:44 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkaccellabel.c (gtk_accel_label_refetch): Remove 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 2aa81d2cce791832db3de66f1a62ec3ddc74c62e..a13891feb95d1cd1b784c729b132f8a78ec12a90 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+2001-11-29  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktextiter.c (_gtk_text_iter_forward_indexable_segment):
+       assertion here that we were at the end iterator was not correct;
+       change code to move us to the end iterator. bug #65731
+
 Wed Nov 28 20:05:44 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkaccellabel.c (gtk_accel_label_refetch): Remove 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 2aa81d2cce791832db3de66f1a62ec3ddc74c62e..a13891feb95d1cd1b784c729b132f8a78ec12a90 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+2001-11-29  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktextiter.c (_gtk_text_iter_forward_indexable_segment):
+       assertion here that we were at the end iterator was not correct;
+       change code to move us to the end iterator. bug #65731
+
 Wed Nov 28 20:05:44 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkaccellabel.c (gtk_accel_label_refetch): Remove 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 2aa81d2cce791832db3de66f1a62ec3ddc74c62e..a13891feb95d1cd1b784c729b132f8a78ec12a90 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2001-11-29  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktextiter.c (_gtk_text_iter_forward_indexable_segment):
+       assertion here that we were at the end iterator was not correct;
+       change code to move us to the end iterator. bug #65731
+
 Wed Nov 28 20:05:44 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkaccellabel.c (gtk_accel_label_refetch): Remove 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 2aa81d2cce791832db3de66f1a62ec3ddc74c62e..a13891feb95d1cd1b784c729b132f8a78ec12a90 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2001-11-29  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktextiter.c (_gtk_text_iter_forward_indexable_segment):
+       assertion here that we were at the end iterator was not correct;
+       change code to move us to the end iterator. bug #65731
+
 Wed Nov 28 20:05:44 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkaccellabel.c (gtk_accel_label_refetch): Remove 

diff --git a/gtk/gtktextiter.c b/gtk/gtktextiter.c
index 5a00c1760a52bbffd3cb796458f5a92764bc0215..a7e685fbc52c4f1d9a9f66153e0605fc605410f2 100644 (file)
--- a/gtk/gtktextiter.c
+++ b/gtk/gtktextiter.c
@@ -2010,14 +2010,17 @@ _gtk_text_iter_forward_indexable_segment (GtkTextIter *iter)
         }
       else
         {
-          /* End of buffer */
+          /* End of buffer, but iter is still at start of last segment,
+           * not at the end iterator. We put it on the end iterator.
+           */
           
           check_invariants (iter);
 
           g_assert (!_gtk_text_line_is_last (real->line, real->tree));
           g_assert (_gtk_text_line_contains_end_iter (real->line, real->tree));
-          if (!gtk_text_iter_is_end (iter))
-            _gtk_text_btree_spew (_gtk_text_iter_get_btree (iter));              
+
+          gtk_text_iter_forward_to_line_end (iter);
+
           g_assert (gtk_text_iter_is_end (iter));
           
           return FALSE;